Duplicate the string returned by d[n]gettext before it is potentially

2007-08-23  Jan Arne Petersen  <jpetersen@jpetersen.org>

	* gtk/gtkbuilderparser.c: (text): Duplicate the string returned by
	d[n]gettext before it is potentially freed. (#461945)

svn path=/trunk/; revision=18678

diff --git a/ChangeLog b/ChangeLog
index 7164e3b5a5f9b2da5f50cbbb54df49e9b547baa4..6d55bbf2a2ad2b896a55481b62afb25c97cf7eb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-23  Jan Arne Petersen  <jpetersen@jpetersen.org>
+
+       * gtk/gtkbuilderparser.c: (text): Duplicate the string returned by
+       d[n]gettext before it is potentially freed. (#461945)
+
 2007-08-23  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtkfilechooserdefault.c:

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 23d45db4791f579112c829525882d678fdc805f5..5c80c101100a15de83b1eedebdd7f377c6cbc994 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -918,10 +918,11 @@ text (GMarkupParseContext *context,
           else
             text = dgettext (data->domain, string);
 
+         prop_info->data = g_strdup (text);
          g_free (string);
-         string = g_strdup (text);
         }
-      prop_info->data = string;
+      else
+       prop_info->data = string;
     }
 }